Propagate srcdir into the test correctly. (#359845)

2006-10-05  Behdad Esfahbod  <behdad@gnome.org>

        * gtk/Makefile.am, gtk/aliasfilescheck.sh:  Propagate srcdir into the
        test correctly. (#359845)

diff --git a/ChangeLog b/ChangeLog
index 9f958bb1f6fc2541f7e3fdc8b000e9b5187d10a0..2ab004a92fa62c4c7dff342c801155d94fad466d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-05  Behdad Esfahbod  <behdad@gnome.org>
+
+       * gtk/Makefile.am, gtk/aliasfilescheck.sh:  Propagate srcdir into the
+       test correctly. (#359845)
+
 2006-10-05  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkrc.[ch]: added new scanner token "unbind" which gets

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0eb166bf2aab4e30fa086a8243dc8c719f35c370..9c02d70fd16317301613969ee296c539983e69fb 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -93,7 +93,7 @@ check-aliases:
 
 .PHONY: check-aliases
 
-TESTS_ENVIRONMENT = gtk_all_c_sources="$(gtk_all_c_sources)"
+TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)"
 TESTS = aliasfilescheck.sh
 if OS_LINUX
 TESTS += abicheck.sh pltcheck.sh

diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
index f350663fb7b4a141ff3d025ed12bfaddb804c8bd..31b49d45103a1efdf7c24e2ad5bf95583dc49da1 100755 (executable)
--- a/gtk/aliasfilescheck.sh
+++ b/gtk/aliasfilescheck.sh
@@ -5,8 +5,7 @@ if test "x$gtk_all_c_sources" = x; then
        exit 1
 fi
 
-grep 'IN_FILE' gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
-grep '^ *# *define __' $gtk_all_c_sources | sed 's/.*define //;s/ *$//' | sort > actual-files
+grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
+{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
 
 diff expected-files actual-files && rm -f expected-files actual-files
-